diff --git a/init.common.rc b/init.common.rc
index 6d66ca7..5950f61 100644
--- a/init.common.rc
+++ b/init.common.rc
@@ -59,6 +59,10 @@
 # If an app forces screen rotation, revert it once the apps closes
     setprop persist.demo.rotationlock 1
 
+# avoid USB crash
+    setprop persist.adb.nonblocking_ffs 0
+    setprop ro.adb.nonblocking_ffs 0
+
 # enable Google-specific location features,
 # like NetworkLocationProvider and LocationCollector
     setprop ro.com.google.locationfeatures 1
diff --git a/sepolicy/genfs_contexts b/sepolicy/genfs_contexts
index fbea22a..ef5b785 100644
--- a/sepolicy/genfs_contexts
+++ b/sepolicy/genfs_contexts
@@ -1,2 +1,3 @@
 # sysfs
 genfscon sysfs /devices/virtual/nanohub/nanohub       u:object_r:sysfs_nanoapp_cmd:s0
+genfscon sysfs /devices/platform/soc/fff04000.rtc/rtc	u:object_r:sysfs_rtc:s0